Rename Console.uri to location. Xend already uses the latter.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/docs/xen-api/xenapi-datamodel.tex b/docs/xen-api/xenapi-datamodel.tex
index 2d52fa7022382eff63500b50b163a16491d89907..70e2f417113c8e7258cfb734b04e135987b9b39e 100644 (file)
--- a/docs/xen-api/xenapi-datamodel.tex
+++ b/docs/xen-api/xenapi-datamodel.tex
@@ -10885,7 +10885,7 @@ Quals & Field & Type & Description \\
 \hline
 $\mathit{RO}_\mathit{run}$ &  {\tt uuid} & string & unique identifier/object reference \\
 $\mathit{RO}_\mathit{run}$ &  {\tt protocol} & console\_protocol & the protocol used by this console \\
-$\mathit{RO}_\mathit{run}$ &  {\tt uri} & string & URI for the console service \\
+$\mathit{RO}_\mathit{run}$ &  {\tt location} & string & URI for the console service \\
 $\mathit{RO}_\mathit{run}$ &  {\tt VM} & VM ref & VM to which this console is attached \\
 \hline
 \end{longtable}
@@ -10954,13 +10954,13 @@ value of the field
 \vspace{0.3cm}
 \vspace{0.3cm}
 \vspace{0.3cm}
-\subsubsection{RPC name:~get\_uri}
+\subsubsection{RPC name:~get\_location}
 
 {\bf Overview:} 
-Get the uri field of the given console.
+Get the location field of the given console.
 
  \noindent {\bf Signature:} 
-\begin{verbatim} string get_uri (session_id s, console ref self)\end{verbatim}
+\begin{verbatim} string get_location (session_id s, console ref self)\end{verbatim}
 
 
 \noindent{\bf Arguments:}

diff --git a/tools/libxen/include/xen_console.h b/tools/libxen/include/xen_console.h
index d8c8f508df70e9b84602f32e6e3afe700a30ce1a..778cbbb4e1b93de38f91d807c7689f6a16cabe69 100644 (file)
--- a/tools/libxen/include/xen_console.h
+++ b/tools/libxen/include/xen_console.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,8 +26,8 @@
 
 
 /*
- * The console class. 
- *  
+ * The console class.
+ * 
  * A console.
  */
 
@@ -65,7 +65,7 @@ typedef struct xen_console_record
     xen_console handle;
     char *uuid;
     enum xen_console_protocol protocol;
-    char *uri;
+    char *location;
     struct xen_vm_record_opt *vm;
 } xen_console_record;
 
@@ -191,10 +191,10 @@ xen_console_get_protocol(xen_session *session, enum xen_console_protocol *result
 
 
 /**
- * Get the uri field of the given console.
+ * Get the location field of the given console.
  */
 extern bool
-xen_console_get_uri(xen_session *session, char **result, xen_console console);
+xen_console_get_location(xen_session *session, char **result, xen_console console);
 
 
 /**

diff --git a/tools/libxen/src/xen_console.c b/tools/libxen/src/xen_console.c
index 18ae6ee498823d9df4d5c8a4fb9fce7914f3d29a..ea014db03e7da4afba11e09a85ad8986549ae123 100644 (file)
--- a/tools/libxen/src/xen_console.c
+++ b/tools/libxen/src/xen_console.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -44,9 +44,9 @@ static const struct_member xen_console_record_struct_members[] =
         { .key = "protocol",
           .type = &xen_console_protocol_abstract_type_,
           .offset = offsetof(xen_console_record, protocol) },
-        { .key = "uri",
+        { .key = "location",
           .type = &abstract_type_string,
-          .offset = offsetof(xen_console_record, uri) },
+          .offset = offsetof(xen_console_record, location) },
         { .key = "VM",
           .type = &abstract_type_ref,
           .offset = offsetof(xen_console_record, vm) }
@@ -71,7 +71,7 @@ xen_console_record_free(xen_console_record *record)
     }
     free(record->handle);
     free(record->uuid);
-    free(record->uri);
+    free(record->location);
     xen_vm_record_opt_free(record->vm);
     free(record);
 }
@@ -164,7 +164,7 @@ xen_console_get_protocol(xen_session *session, enum xen_console_protocol *result
 
 
 bool
-xen_console_get_uri(xen_session *session, char **result, xen_console console)
+xen_console_get_location(xen_session *session, char **result, xen_console console)
 {
     abstract_value param_values[] =
         {
@@ -175,7 +175,7 @@ xen_console_get_uri(xen_session *session, char **result, xen_console console)
     abstract_type result_type = abstract_type_string;
 
     *result = NULL;
-    XEN_CALL_("console.get_uri");
+    XEN_CALL_("console.get_location");
     return session->ok;
 }